From: Jim Blandy <jimb@redhat.com>
Date: Wed, 31 Mar 1993 07:19:25 +0000 (+0000)
Subject: * keyboard.c (parse_modifiers, apply_modifiers): Make sure we're
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~96624
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=734fef9492c91bf15fef9c1a9cff9ac2ad320570;p=emacs.git

* keyboard.c (parse_modifiers, apply_modifiers): Make sure we're
	not trying to create modifier masks using integers which are
	unrepresentable as lisp values.
---

diff --git a/src/keyboard.c b/src/keyboard.c
index d80cf2d83e8..91e4ee1f477 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2485,6 +2485,8 @@ parse_modifiers (symbol)
 		   Qnil);
       Lisp_Object mask;
 
+      if (modifiers & ~((1<<VALBITS) - 1))
+	abort ();
       XFASTINT (mask) = modifiers;
       elements = Fcons (unmodified, Fcons (mask, Qnil));
 
@@ -2521,6 +2523,8 @@ apply_modifiers (modifiers, base)
 
   /* The click modifier never figures into cache indices.  */
   cache = Fget (base, Qmodifier_cache);
+  if (index & ~((1<<VALBITS) - 1))
+    abort ();
   XFASTINT (index) = (modifiers & ~click_modifier);
   entry = Fassq (index, cache);
 
@@ -2538,6 +2542,8 @@ apply_modifiers (modifiers, base)
       Fput (base, Qmodifier_cache, Fcons (entry, cache));
 
       /* We have the parsing info now for free, so add it to the caches.  */
+      if (modifiers & ~((1<<VALBITS) - 1))
+	abort ();
       XFASTINT (index) = modifiers;
       Fput (new_symbol, Qevent_symbol_element_mask,
 	    Fcons (base, Fcons (index, Qnil)));